Merge "Minor eventlog and LocationProviderBase cleanups" into sc-dev