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

* commit 'ae6749784c9e04ad3e6783bebfb8a92771ea7267':
  Revert "Revert "Revert "Revert "Fixes and improvements in ReferenceTypePropagation""""