Merge changes I63a8ceda,Ibc34b74a am: cc82fd9795 am: a75a4c157b

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

Change-Id: I82a0e3880e36bd15f30df7f418eaceb13bd4fa89