Merge "Merge android-4.9.217(d2adeff) into msm-4.9"