Merge "Fixes the transformation of metrics." into pi-dev am: ff5ab06788
am: e40378d840

Change-Id: I104b6d75e4d654c1144a5faccfe1011c6b4f4e18