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

Change-Id: I968aa86473d15afd5c50c30b2acb961b70bec351