Merge "Use ASSERT_EQ for size assertions." into rvc-dev am: a3461a2d4a am: 543b79d280

Change-Id: Ib9db1aeec5b562afb22b1ab6921554560ba939a7