Merge "Merge android-4.9.112 (9e79039) into msm-4.9"