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

Change-Id: I7ddad2c5dd22f31c812683c4a715dc7738605ff9