Fix new NPE relating to reorder hints

Change-Id: I80ff327ee549caef5802eb7194d48b1e8424ce47
1 file changed