[automerger skipped] Merge "Resolve resource ID at runtime to stabilize tests" am: f9b69119bf am: 44022a761d
am: 1eaa996e29 -s ours
am skip reason: change_id Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6 with SHA1 5764173a9f is in history

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