update from clay's suggestion of the cl aosp/1564973

Bug: 174696163
Test: atest acloud_test --host
Change-Id: I596a8da2ea34f1055408ea2ff281c23fd02638dc