Changes for alarmed metrics

Use alarmDefintionId instead of alarmId to find the right notificaion.
Further changes are needed to complete this change.

Change-Id: I577559fd085261f01a36355095fa1c04a72fb9c9