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

Change-Id: I8729b4e7d7214b348543a14a226b1c5a0d4a1ba8