Merge remote-tracking branch 'lsk/v3.10/topic/gator' into linux-linaro-lsk