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

Change-Id: I3b08cf27f6407fdf5789f8a49c3b3aa49f1c1ecd