am 6df1d46a: Merge "Revert "Revert "Revert "Fixes and improvements in ReferenceTypePropagation""""

* commit '6df1d46a5d0d4d8f90ee94921657f5bd1420301e':
  Revert "Revert "Revert "Fixes and improvements in ReferenceTypePropagation"""