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

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

Change-Id: I443783327be3a926e9e1d856f8be39cd9c35abf3