[automerger skipped] Merge "Resolve resource ID at runtime to stabilize tests" am: f9b69119bf am: 44022a761d am: 1eaa996e29 -s ours
am:da507ff0df-s ours am skip reason: change_id Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6 with SHA15764173a9fis in history Change-Id: I4a75fe6e5053387cb6cf3e6d8bea00056e3ade71
This commit is contained in: