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

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

Change-Id: I0e33268d0cd0bed91aab3abcd2ce459a0859b6ca