am: 5f6b9082 * commit '5f6b9082': Avoid constructing types with errors. Change-Id: I6d485c907669fb64644c71a2b618ae11f9654633