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