Merge "[automerger skipped] Merge "Ensuring consistent default emit values to build" into udc-dev am: ffd922ac5e am: 913922f552 -s ours"