am fa4d7d73: am fd951391: Merge "Fix issue where old alarm manager triggers...
am fa4d7d73: am fd951391: Merge "Fix issue where old alarm manager triggers are being listen to." into klp-dev
* commit 'fa4d7d73':
Fix issue where old alarm manager triggers are being listen to.