Account for Percent-based parent paddings am: 72de056
am: 625c4ee

* commit '625c4ee8d90acb46e0f274fe25b528205c624510':
  Account for Percent-based parent paddings

Change-Id: I42b49aedc13a46ffab64f6b6670829bfe1428b36