Merge "Use SharedRefBase::make to allocate." am: 88376bfc71

Change-Id: Ib0888510692c11199092db819099a1c479aa831f