Merge branch 'lsk/topic/tc2' into linux-linaro-lsk