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

Change-Id: I0c29f2e05c09a5b17fc77fd5e5162f1935df71a4