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

* commit 'df45f5231c09249bdd68c4664f4214c6d1e6dc0f':
  Fix a bug in type propagation.