Merge changes Ia3402742,I547f1f63 am: 030d036517 am: b11091765d

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

Change-Id: Ia039c479e16f8b01918987fc49908f602efec06b