Merge "Replace deprecated assertItemsEqual"