[automerger skipped] Merge changes from topic "location_provider" am: 79b473ed7b am: 77390bf307  -s ours
am: 6a2ccc107c  -s ours

Change-Id: I4063ae283ea8ef0a43957bb5e1aaf68a14c63416