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

Change-Id: I3eb5ae2219adf562ada8b1daac9047b23bc41021