Merge "[ATF-integration] Make sure data can survive render path" into rvc-dev am: 1e60ca9a26 am: 61c00b857b am: a2197e3983 am: 36215c509a

Change-Id: I08331fe7de9c8d3c485abeff203de31b070a5c10