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

Change-Id: I2c39e6ea7c0429054fc6d63e0855bcfed691daf2