Merge "Remove OldSystemTest#test_load from known failures."
am: 542c6df669

Change-Id: Ida34775a0032cd5342292c83bce46a9589eacb6e