Merge changes I49f17c5e,Icae6aec9 am: 5a645e7687 am: cba43af0aa

Original change: https://android-review.googlesource.com/c/device/google/cuttlefish/+/1653718

Change-Id: I285550df5d988f90aab15178555cb85c094d9d59