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

Change-Id: I8376ea2f5fb2c3fc7191d517390ca536e7526200