Expected value is the first parameter to assertSame() or assertEquals(). Based on code search `assert(?:Same|Equals)\(.+,.+expected`, some assertions that I am not clear about are not touched. Change-Id: I2893b730428529745885bc83f0fecb168d48fbf7
8d96136