Merge "Merge android-4.9.178 (df08e34) into msm-4.9"