Merge "Add test for content inflation during row inflation" into rvc-dev am: c7514c9f am: 25de976e am: 7dea76e0 Change-Id: I463552fcc7ab105db8e72916068f3123e0d85f4f