Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-android