Merge commit 'refs/changes/05/2487005/1' of...

Merge commit 'refs/changes/05/2487005/1' of ssh://git-android-hyd.quicinc.com:29418/kernel/msm-4.14

 into HEAD

Change-Id: Ibb0c429ef6dd042deeda3c43dbb475704658667e
Signed-off-by: Ashwini Muduganti <amudug@codeaurora.org>
Signed-off-by: Niranjan Reddy Dumbala <dnreddy@codeaurora.org>