Merge "Unbreak Odroid measurements." am: dcc6617d48
am: 3435e10597

Change-Id: I2d42709e986302a261de4791bf05e11e8c6657df