Merge "Fix zen alarms only mode check" into qt-qpr1-dev
am: 9c81f1754c

Change-Id: Icc9bff293fec3cf4ddd4255b74a4709b249bb7e9