[automerger skipped] Merge "Optimise the hit test algorithm" into pi-dev am: 0192e9a213
am: 32ea362e11  -s ours

Change-Id: Ib221a37ca6319a68c1a7fd0ed3d0be4e08dade7c