Merge "Remove ref<>."
am: 081b653683

Change-Id: I0cf76e5410bab4b0abc618efef66de66eecf98de