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

Change-Id: I28ca0bb3d9eea3f0d2127e313fb30b76eff8f2e7