Merge "Unbreak Odroid measurements."
am: dcc6617d48

Change-Id: I4007db656c4f988840e26d61d39143bc65d381d4