Merge changes I44fdecfb,I1f2081e4 am: fd7bfa1fa7

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1324657

Change-Id: Idacf484c09cad4e4ebfb1142f2c8e0f4d4cf0a52