Merge "adb sync cleanup."