Implement match by for alarm definitions

Change-Id: Ie1803f5dbf137970f95c8a852d53e93476d206d8
Merge "Implement match by for alarm definitions"