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

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

Change-Id: Iee47258b431077356dfd0bf832b0588706f72aea