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

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

Change-Id: I3cdbab620c71f0a1ea0437f3d14fafd7d6c7a65f