Merge "Merge android-4.9.117 (8b21e85) into msm-4.9"