Merge "Fix frozen alarm issue" into oc-dev am: af4bfcdb7e
am: 7ff81553bd

Change-Id: Ibf7da2469f3158110a1d67e1234f949f8a577b00