Merge "Merge "Refactor: move dataLoader details to a separate class." into...
Merge "Merge "Refactor: move dataLoader details to a separate class." into rvc-dev am: 77102700 am: 53ba0327" into rvc-d1-dev-plus-aosp am: c7df7e2b am: c0a53e9e
Change-Id: Ic19f191d96979ebd147f081bbeb0967ce193f5ee