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

Change-Id: I38f5cd2ff40e8511809a9729e2ca1722f1ac2970