Merge "Resolve resource ID at runtime to stabilize tests"
am: f9b69119bf

Change-Id: I441a025af2263522fc4c14cb2fd17ccffe149819
tree: 3215f19bee762e0122dc98c6becc93839c2e82e9
  1. tests/