Merge changes I1b6bd84e,I847db96b am: 132b45f0a2

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

Change-Id: I78e3f9770ea3bb60efee273da4fb2eac0664f9c4