Merge branch 'LA.UM.8.1.C9.09.00.00.518.406' via branch 'qcom-msm-4.14' into android-msm-sunfish-4.14 Bug: 148752159 Change-Id: I3d2e69488d7684d528d12f3c950f45601f74dc34 Signed-off-by: Alex Hong <rurumihong@google.com>