Merge "Use runtime-resolved resource IDs in tests."