[ Merge of http://go/wvgerrit/137809 ] Bug: 204946540 Test: Metric unit tests Change-Id: Ibd68db73ea9ee64664d33c2cb8e8bb7c56674c27
[ Merge of http://go/wvgerrit/137809 ] Bug: 204946540 Test: Metric unit tests Change-Id: Ibd68db73ea9ee64664d33c2cb8e8bb7c56674c27