Merge "Workaround adb issue in run-test."
am: 0b3e72e56e

Change-Id: Ibfcc8e9eb06e010ea387c399c69ef02c50912d0f