Merge "Remove ref<>." am: 46a6469a12 am: 6e3645a8ce
am: c221d87fe5

Change-Id: I670c6f474da64d63df87076558baec2ab5ef0bce