Merge "Merge android-4.9.160 (fd5657a) into msm-4.9"