Merge "Modify LocationAccessPolicy to use LocationManager" into pi-dev