Merge "remove legacy adb data loader"