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

Change-Id: I3c07647a50cc872393e7f0a52aef16b179a342c0