linaro changes

Change-Id: I6ad5ab307bafd88d6871a2b65accf3e218828713