assertEquals order wrong

Change-Id: I822b6ac5b8e8c3009d1ee2d647376eff84559c11
Partial-Bug: #1277104
Merge "assertEquals order wrong"