Merge "Merge android-4.9.120 (f85543b) into msm-4.9"