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

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

Change-Id: I443256cfa6b656bdce290740bb3bd58b4d817a72