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

Change-Id: Ifcb44588c49446e5271a7ecdb4155ee0c4b948c7