Merge "Merge remote-tracking branch 'dev/msm-4.14' into msm-4.9 08/19"