Merge branch 'LA.UM.8.1.C9.09.00.00.518.158' via branch 'qcom-msm-4.14' into android-msm-floral-4.14

Bug: 132954074
Change-Id: I615c9958a83e1c2d7fd95288ed4c4e60eb1baa59
Signed-off-by: Wilson Sung <wilsonsung@google.com>