Change from pointer to directly owned/contained object. Update const usages. Add non-const asStruct() accessor. Change-Id: Idd87c153fa09d1c36faa7ec3317ed872a43dd3c3