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

Change-Id: I8ada8247bce7266392cdceea8e069b45f3a38e3b