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

* commit '7aa4ac9f66d3b10e8a45a2c74be17e4e955b8910':
  Fix new NPE relating to reorder hints