Merge "Fix race with LOS Begin() and End()"
am: 1cf518c744

Change-Id: I6bb9d1f79c022fc133e3bd30ab19d31ff0ad2093