Merge "Merge android-4.9.145 (6328e64) into msm-4.9"