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

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

Change-Id: Ie5310c2f5b2b1a4afd31dafff3e48995077975c5