Merge "Add new type into metrics_constants.proto" into pi-dev am: 603824a6e7
am: a1515b588e

Change-Id: Id6fafb25aaaffea432358dd770318b438254b761