Merge \"Use metrics defined by proto in new Settings tabs.\" into nyc-mr1-dev
am: b2728f51fb

Change-Id: I4dceebf40bc15302d2fea43cc733c64a04ca2fea