Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y