Merge "Merge android-4.9.95 (b4c14c2) into msm-4.9"