Merge "Fix last use of assertDictContainsSubset"