Merge changes I44fdecfb,I1f2081e4 am: fd7bfa1fa7 am: 3159968042

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

Change-Id: I1c8f09379c353b512e96d9702c79659e2bc8be2a