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

Change-Id: I23ca86e3bf3df6684d88f1be575f2be1599ac9eb