am 68a8469a: am 85806723: Merge "Fix a bug in type propagation."

* commit '68a8469af25716cfce8332a033c881f25d264ee2':
  Fix a bug in type propagation.