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

Change-Id: I8ebf997150bd39db6be6fa099ae17e6792e47efc