Linaro: Update 1303

Change-Id: Idb50d681a1372b85a25a91129caf22009d3fdbbd