am: d3968c03 * commit 'd3968c03': Avoid constructing types with errors. Change-Id: If4c25a0968887d26da50a68e077e6379236ae430