Merge "Add cheeps option to acloud"
am: 6263e91f33

Change-Id: I18adcd1f3eea09d0ee8f2011d51af59a792329cb