am a0a4870e: am 6effa1e3: am f2551ffc: am 1f60653a: Merge "Adding reorder hinting, hopefully will help with (issue 10654628)" into jb-ub-now-kermit

* commit 'a0a4870ec0fe6fa6df70fe85472f586a07584537':