Merge "Acloud: Failed on atest acloud_test when running repo upload"
am: fc0836257f

Change-Id: I0a690253138f12253bcc58e83ad621c30746127d