[automerger skipped] Merge "Stop location to avoid timing issue" am: 0291d3fcd3 am: bbc5a01d1b am: 9d27cbbd34 -s ours
am skip reason: Change-Id I04894426e8384d25f2b5e269961a9cf051cab40f with SHA-1 b983f10362 is in history

Change-Id: I4435123b979c1590ebbeedb779a859ba4d33efd6