Merge "Remove deprecated throw statement in PaddingManager"