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

Change-Id: I3032f89348ccbe40a59d6411e03f74c103b008ff