Merge "Gps geofence." into jb-mr2-dev