Merge "Revert format change related CLs"