Merge changes I63a8ceda,Ibc34b74a am: cc82fd9795 am: a75a4c157b am: e357812286

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

Change-Id: I45ca4d233bcb19f81f708e5292346963e7487a40