Merge "Merge android-4.19-q.72 (64f28a8) into msm-4.19"