Merge "port metrics_logger to v2 format"
am: 75a8233c7e

Change-Id: Ia17401c174b3ecbd7f45c141d192987e75d85bdd