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

Change-Id: I4ef1c68ebfda6a1479e23bd11e8a3df95209a17c