Linaro: Update 1304

Change-Id: I823408a0780421b501345e33c783d05c78d25712