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

Change-Id: Ibc48a7fbadc68650038003c894978ec5da5676b7