Merge "DataLoader lifecycle cleanup." into rvc-dev am: 42cac08f17 am: 86ada139a2

Change-Id: I5ff52a027ce5cd76a77b818ce8a1757e86fd4801