Merge "Remove ref<>."
am: 46a6469a12

Change-Id: Id48556abc47e6c7e080b665eb815d86873170a4a