Merge "Fixing checkstyle presubmit hook comments."
am: 2944457958

Change-Id: Ie9758322c6bcea572d8976b0ea85012f976d0bca