Merge changes I5f1a954d,Ibeaac890,Id9f9dfc5 am: deee9bafec

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

Change-Id: I0bdc3cd1e05e9fe77e108dcccb0efe3c059864c1