This is a merge of http://go/wvgerrit/13752 Replace the mock's macro with a memcmp because that is even cleaner. Change-Id: Ie402689ca9e14a67736db7eea928204f067427ac