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

Change-Id: I51717846ad7978bd84b764f7892e98599f04fcec