Linaro-4.8

Change-Id: If5fe0d59b606270863b506eba37d460bb266a7f7