Merge changes I5f1a954d,Ibeaac890,Id9f9dfc5 am: deee9bafec am: 86b6dd30be am: 6bc6f57e2f

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

Change-Id: Icb54b1a587534a4b81d835443159ff0f381e52eb