Merge "Merge branch 'qcom-LW.BR.4.0.3-03700' into android-msm-fossil-4.9" into android-msm-fossil-4.9