Merge "Merge android-4.9-172 (2dbf78b) into msm-4.9"