am: 709fb646 * commit '709fb646': Avoid constructing types with errors. Change-Id: I2f0bc659991bc9cfcddf1e4442714a4505e24aba