Merge changes I5f1a954d,Ibeaac890,Id9f9dfc5 am: deee9bafec am: 86b6dd30be am: 6bc6f57e2f am: 84219d366d am: 5c045ae885

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

Change-Id: Id8c09250568ddfe757ee05ea8a0a967a5a0d4c3f