Merge "Merge android-4.9.129 (b727d1c) into msm-4.9"