Merge "Expose Location toggling logic" into oc-dr1-dev
am: 4f0e5f8395  -s ours

Change-Id: I888297c779795ad7489be0e7238d2bc5d673610e