Restore padding.
am: eded2fcf7a

Change-Id: I4f708fc0eb26ecf4844f4d48b9d87a979fb0d61a