Merge \"Add metrics for new tabs in Settings.\" into nyc-mr1-dev
am: 1f7be32325

Change-Id: I86aa5d13ecb733c95d3f2456f5df6a6b62860ca1