Merge "Merge "adb: fix abb test." am: fc4e54ecb0 am: 6016dd02a4 am: efa13fc083 am: db8b12cd76" into rvc-qpr-dev-plus-aosp am: bc455c3b93

Change-Id: Ida251dae92f187d13a25015149fc79f533769a14