Linaro 4.7

Change-Id: I1f2b105a7451b371820f1cd66cc75eb84c5c4750