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

* commit 'e6d2305f6240c9b63a2d9aec80a59676778e3712':