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

Change-Id: I6a964a5f3d1dcac23b456f38abb58a404ec29648