Merge "Bigger ownerInfo padding" into pi-dev
am: 96dc1ca74e

Change-Id: I058acb76ff1d92c29fd35bff51a24c83b7355806