Merge "Refactor: move dataLoader details to a separate class." into rvc-dev am: 771027008b

Change-Id: I8ea351f618140aff38823d8680845c0668b5ac78