Merge "Merge android-4.9.152 (fd37e28) into msm-4.9"