Merge "Fix the unittest fail." am: 367ad4f733 am: 586c99d46a

Original change: https://android-review.googlesource.com/c/platform/tools/acloud/+/2038006

Change-Id: Id58e7ed05b28a8eeafae5d61d0fc96e181a97734
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>