Changes to work with alarm definition

Change-Id: I2c6a5c2a3b3595a74bef0c4bef7d621e0319d477