[automerger skipped] Merge "Optimise the hit test algorithm" into oc-mr1-dev...
[automerger skipped] Merge "Optimise the hit test algorithm" into oc-mr1-dev am: bbfee318 -s ours
am: b6c9be3a -s ours
Change-Id: I3b7d566cd344ac2e3c8baf62bfee879e0fd9761c