Merge "Add test for content inflation during row inflation" into rvc-dev am: c7514c9f am: 74cdb6fd Change-Id: I84f642d13384dbc82cafb2e05fa6568900edbd1d