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

Change-Id: I5ef31499bd1e21237fa8a1752c035ae8341235b9