Merge "Add tron metric logging" into pi-dev