[automerger] Optimise the hit test algorithm am: 3b6f84b77c am: 5b224ccf41 skipped: eb86ac42e6

Change-Id: Ida4ae11d778115fb1f0d373523f71845fff88331