am d039b6e2: am fe69287b: Fix new NPE relating to reorder hints

* commit 'd039b6e2546311cb197e93c01b9b2a8752225f0e':
  Fix new NPE relating to reorder hints