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

Change-Id: Ica943f6dedc13e997b314b955c08e1e4a00aaff8