am 3dac766e: Merge "Revert "Revert "Revert "Revert "Fixes and improvements in ReferenceTypePropagation"""""

* commit '3dac766eda0002ec020decee9270afe46ba17047':
  Revert "Revert "Revert "Revert "Fixes and improvements in ReferenceTypePropagation""""