Merge "Stop location to avoid timing issue" am: 0291d3fcd3 am: bbc5a01d1b

Change-Id: I706ac54227e3138b0eeb0f48294d2ab3cf9ce47f