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

* commit '5bc48dc07d0aff22a284831a68e6606162532d77':
  Revert "Revert "Fixes and improvements in ReferenceTypePropagation""