Merge "Merge android-4.9.155 (32e6695) into msm-4.9"