Merge "Add OWNED_BY field." am: 107141be5c
am: 9c7be233c3

Change-Id: Icf11a35867625a5a47450f5dc9a1b05ec00de502