Merge "Fix NPE in removeGeofence" into qt-dev
am: 365e2c0dae

Change-Id: I99001500e313ac65d56564663688ed5f90e82114