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

Change-Id: I3f0cf6e416fbe983e9758fc8a4b2ad8e104aa422