Alarm Definition bug fixes

Change-Id: I20d800e0f6319602221a98b26ee2cad4e1f9dead