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

* commit '6589fee180d2514f03253f724ba8e957a66dca45':
  Revert "Revert "Revert "Fixes and improvements in ReferenceTypePropagation"""