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

Change-Id: Ic1fea7e6e5dee2ef6fd3e853e8e4e1d13e9c1ed4