Merge "Fix issue #21814207 and issue #21814212 (alarm manager)" into mnc-dev