Merge changes I1b6bd84e,I847db96b am: 132b45f0a2 am: eea8bb4e80 am: 540c9ade68 am: f1f183b646 am: 700a7530de

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

Change-Id: I008e30ff0eb899518073879ffb1006111f6ca742