Merge "Replace deprecated assertDictContainsSubset"