Merge branch 'tracking-gator' into merge-linux-linaro-core-3.4