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

Change-Id: I550f8cd8707386d503c2ef13e741b5403525cb70