Remove last of AssertEquals

Change-Id: I2f130e10c387bd8828ef35d5dce16fbf87557c3b
Merge "Remove last of AssertEquals"