Merge "Improve alarm in-flight diagnostics" into oc-mr1-dev am: 39a7fe7939
am: 8a04ed4c46

Change-Id: Ic267302dad04c428557168552d9b0299a9186cfa