Merge changes I4656cea1,I1f7178c9 am: e100a9d2c8

Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/1818094

Change-Id: I029d9a4ad07cb8856b36b1ed6a72cadacb85dbba