CM merge borked a linaro merge, this *should* set us straight

but really back to work now

Change-Id: Ie99d4564b48e8fc427ae937ec1f10e4e9a7af115