Merge "Replace shared_ptr with plain object"
am: 9114ffd85e

Change-Id: I1e66528aba1d2e51049ed0fa37d781e0d3dcb31d