Merge "tests: Move ResourcesTest into component test." am: 07d0032def am: 9adbc572a3
am: 3b8d2df76d

Change-Id: I3ab2cda5dcb385fa769ad246a656d2e0b30edbda