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

Change-Id: I1697397a0aafc7cb0c0220da8982d926a6ac68fb