Restore padding. am: eded2fcf7a am: 1b6b6911e4
am: a387d2ec40

Change-Id: I2151106774fb37970c430d331d35cc208ec96742