Merge "Avoid constructing types with errors." into nyc-dev
am: 709fb64

* commit '709fb64646823e55b1c687eb0efa822f7d9563d7':
  Avoid constructing types with errors.

Change-Id: I2f0bc659991bc9cfcddf1e4442714a4505e24aba