Merge "Merge "Fix NPE in removeGeofence" into qt-dev am: 365e2c0d am: e9d99347" into qt-r1-dev-plus-aosp