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

Change-Id: I21eec897f60f19f86b27052479c91f84eb55349d