Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395
am: d1b29a4350
-s ours
am: 4023fdd48d
-s ours
Change-Id: I1b1ed19fded781288ee7264d5b190cb09a979882
This commit is contained in: