Merge "Refactor: move dataLoader details to a separate class." into rvc-dev am: 77102700 am: 88dddc9a am: 6611c5e4 Change-Id: I13dd3cc0b6a5024076aee5c8b2a1c83c7fe3b936