Merge "Unbreak Odroid measurements." am: dcc6617d48 am: 3435e10597 am: 882b07263d
am: 4ef863c4e6

Change-Id: Ic9c264fee99ae932223792ee8ebe75b5bc5e98ba