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

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

Change-Id: I812944f44712d86603c71c51e7cc3b1d9105d168