Merge "Fixing checkstyle presubmit hook comments."