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

Change-Id: I02843fac3788099403883728893f6659c9d0d24e