Linaro Fix

Change-Id: I2f60739141d91c9fa8ab53fd0bd141b965d3d5d4