Merge "Merge "Avoid constructing types with errors." am: 5f6b9082 am: d3968c03" into nyc-dev-plus-aosp