Merge changes I22cfd132,If6784590 am: 92fd6ed17b

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

Change-Id: I1057fa53829e3cbf9187cb07ac37fede6aad04b8