Merge "Restore padding." into nyc-mr1-dev am: 67abc837af am: a70315d35f
am: 7fed44061a

Change-Id: I8cd5b03d346100529ea828f4604137b38e868cf7