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

Change-Id: I2d935442e9587ca3c71be303aba9b44730cb1964