Merge "[automerger skipped] More robust tests. am: 2a6cec9647 am: 5162f69948 am: 9c36653159 -s ours am: 7787c0536e -s ours am: 309e8ae86d -s ours" into udc-d1-dev-plus-aosp