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

* commit '85806723695120d183e85e9d12d52340b839b781':
  Fix a bug in type propagation.