Also made the length of the first line to be 80 characters where possible.
Revision created by MOE tool push_codebase. MOE_MIGRATION=3896