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

Change-Id: I943daa02b15b72ba7d56f6ed8dc30ed81a34553e