Merge "Replace the use of assertDictContainsSubset"