Merge "Merge android-4.9-o.77 (dcb2674) into msm-4.9"