DO NOT MERGE Fix listenerId in GeofenceManager am: a2f847e7 am: a743d5cb am: b0c37f67 am: 504ebe09 Change-Id: If22820e26d1789933fb6d295af384a32d03f792e