Merge "Merge android-4.9.186 (cd46375) into msm-4.9"