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

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