[automerger skipped] Merge "Optimise the hit test algorithm" into oc-mr1-dev am: bbfee3189d  -s ours am: b6c9be3ac2  -s ours
am: a6f270d1e3  -s ours

Change-Id: Ibcb53315ed6415847ae1ef254933c5fee4420cc6