Merge changes I44fdecfb,I1f2081e4 am: fd7bfa1fa7 am: 3159968042 am: f7a1f499df

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

Change-Id: I5506c44e98f528202baab9ede75b1456c2cfdae3