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

Change-Id: Iaeddac03bcf98c1d714c96b54344d8cf874682d2