Merge "Clarify ownership of returned pointer"
am: fefdf667a0

Change-Id: Ief0d50b0ee8bcd5cbd521acce6a5d4cdf91e4e11