Merge "testing: Allow adb sync to succeed when vendor is full" am: 773833332e am: ea6e5db102
am: 7babd5246e

Change-Id: I8ae45c2860d1fe0497dc4a5371decb7fc4ead1d5