Merge "Use an exact alarm for location timeout." into sc-dev