Merge "Fix a bug in reference type propagation." am: 3f432d5a7c
am: 032beeb692

* commit '032beeb692385dbdc07cb7476037ca412a43af47':
  Fix a bug in reference type propagation.

Change-Id: Ib5ea78309bb8ae75d060b25959334f8b9053577f