Merge "Add tron metric logging" into pi-dev am: c219863763
am: 40a1f6b2b7

Change-Id: I0a5028a3fa73b5f9927826871438b38390c43c03