Restore padding. am: eded2fcf7a
am: 1b6b6911e4

Change-Id: I70eafecab4bb48cbeeb85f0fe28af4d096957481