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