Merge "port metrics_logger to v2 format" am: 75a8233c7e am: d28d543c48
am: 43bae3f568

Change-Id: I94b60101e721cab71213b2adbc09c1bdd70ffec2