Merge "Clarify ownership of returned pointer" am: fefdf667a0
am: 612c9915ce

Change-Id: Ib372b8fb2d112c18fc0c1427e4314ac2723fb277