Merge "Disable flaky test testRemoveContainer_deferRemoval"