Merge "Use ASSERT_EQ for size assertions." into rvc-dev