Merge "tests: Create res-testdata for testdata pickup." am: 2cc6211165 am: e5734c014f
am: 9c2145d297

Change-Id: I584a1377a809bf730773e824f818fedb9fb75aa5