Merge "Merge android-4.9.110 (00a0bcb) into msm-4.9"