Merge "Hook up emergency metrics" am: b1b1c64f22 am: a644173ca1
am: 161c4d94a5

Change-Id: I5da48c0046a15540e4eddf213da09568fb35c5cb