am d21b695f: am 22433a33: Merge "Fix issue #21814207 and issue #21814212 (alarm manager)" into mnc-dev

* commit 'd21b695f8b344b12e623694db86856a89642d934':
  Fix issue #21814207 and issue #21814212 (alarm manager)