Merge "DO NOT MERGE Fix listenerId in GeofenceManager" into rvc-dev am: 08bd8964 am: b4e7cbb8 am: 4e9b64c3 Change-Id: I752b3f511278c55982a311eefdc3e0983874b7e4