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

Change-Id: Idea7c8911a09578103e033430fbb7186b30ba777