Merge "Merge android-4.9.106 (8b94b87) into msm-4.9"