Merge "Fix race with LOS Begin() and End()"