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

Change-Id: Ia13c3f4b0940f2089f747d6cf23cc691889f0b25