Merge "Require ACCESS_FINE_LOCATION for Geofence use." into jb-mr1-dev