Merge "Acloud: Keep acloud command-line arguments consistent." am: a969ad3a88 am: e8a124e1d6
am: 1dcbbf060c

Change-Id: Ic47bd089bc87383e7ee54927693c522df7ca5b8a