Merge changes I22cfd132,If6784590 am: 92fd6ed17b am: b2bb602e7b am: d05a64fab2

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

Change-Id: I08da28d0a7d8a5eec23dd423063b694e6a50e97b