Merge "[automerger skipped] More robust tests. am: 2a6cec9647 am: ff5384f85c -s ours am: d1a8496de5 -s ours am: 7e12ae1254 -s ours" into udc-d1-dev-plus-aosp