am 5716a1f0: Merge "Revert "Revert "Fixes and improvements in ReferenceTypePropagation"""

* commit '5716a1f07380eb3d6e6a47b6589bcfe78b93be0f':
  Revert "Revert "Fixes and improvements in ReferenceTypePropagation""