WIP - Event changes for alarmed-metrics support

Change-Id: I86c394d33d93cc14af8900a8dd240e0058eb31b2