Merge changes Ia3402742,I547f1f63 am: 030d036517

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

Change-Id: I2ef0ac5cd4f012797c52ff6d004e13030aa21c4e