Merge branch 'test' into linaro-4.10