Merge changes I1f98b5be,I941eabdd into main am: a5324af4c0 am: 4261dfa4f8 Original change: https://android-review.googlesource.com/c/platform/tools/acloud/+/2994197 Change-Id: I09ee74cffaef9420583a00517e282b28005f8526 Signed-off-by: Automerger Merge Worker <[email protected]>