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

Change-Id: Id549d4c3d84eac2295f100a9a60d0b92ecf0f832