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

Change-Id: Iddd6fd884fb1a0ea2bf00d17fcb77126267b229e