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

Change-Id: Ib58f6c77e6211c73df7190c02483352fb4deb56a