Merge changes from topic "location_provider"
am: 79b473ed7b

Change-Id: I9a9985fd18db00d510ebae9e0dec69d6647a2332