DO NOT MERGE Stop location to avoid timing issue (VTS 2.0) am: 50958448b8

Change-Id: Ie6c15a267e4b22d81b2ccf72864330f95617e034