acloud: Cherrypick cl/203969178

Bug: None
Test: ./run_tests.sh
Test: m acloud_test && acloud_test
Test: m acloud && acloud create_gf
Change-Id: I28e292f0406b631a20ce9fa95b5a51cd7822f59f
3 files changed