Merge "Merge android-4.9.127 (be4935d) into msm-4.9"