Merge "[automerger skipped] Merge "Remove some assertions to speed a test" into udc-dev am: 8d2ea505 am: c3cf38e5 am: 9060c443 -s ours" into udc-qpr-dev-plus-aosp