Merge "Fixing some flakiness of some DL Manager tests." into gingerbread