Remove last of assertEquals

Change-Id: I6411563df90235e1fea0760e1550b705d4fd7182
Merge "Remove last of assertEquals"