Make padding consistent for extract and timestamp

Change-Id: I3dc9fa9631a9ab17953195cd51eb192b0b009dca
Merge "Make padding consistent for extract and timestamp"