Linaro 4.7

Change-Id: I3e91ef8887d8215f291a8ff8e23e208ae323fa5f