Merge "Merge android-4.9.199(dcb71b3) into msm-4.9"