Merge "Merge android-4.9.90 (dd1e37e) into msm-4.9"