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