am 88d751b2: am c5bee2a1: Merge "Revert "Fixes and improvements in ReferenceTypePropagation""

* commit '88d751b270c99e162dadec0c584efb0471e39da8':
  Revert "Fixes and improvements in ReferenceTypePropagation"