Merge changes I63a8ceda,Ibc34b74a am: cc82fd9795

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1722370

Change-Id: I98c78f85bd8830b7f0182f0bba81f94e9d507558