Merge "[adbdataloader] correct component name"