[automerger skipped] Merge "Optimise the hit test algorithm" into oc-dev am: 6064d8fd4c am: 0348259446  -s ours
am: 86c2ef5bde  -s ours

Change-Id: I334cf06de7d1e48eb52710c5844daa2b32b5b07c