Merge "Don't remove OnAlarmListener mappings in the client" into rvc-dev am: 007a73c551

Change-Id: I9eaad484821b38b8df8951fee1f3641a2d749503