Merge "Use zero filled alignment padding before method code"