Merge "adb: Avoid extra string construction" into rvc-dev am: 386e91d21c

Change-Id: I876983c946ecaee8b0443b9c5acdca66321d22ad