Merge "Merge android-4.9-o.82 (2d34d45) into msm-4.9"