CP cl/252105282

Bug: 123894473
Bug: 134739096
Test: atest acloud_test --host
Change-Id: I434981c036770f14f4a32e8420c23fa28489c757
5 files changed