Linaro Fix

Change-Id: I055b230a568ebbc2aece7ee9cbd5db085b37cbf1