Merge "Merge android-4.9.125 (a925dfb) into msm-4.9"