Fixup comment blocks

Change-Id: If28bba63fd1f7962707a4c2c84aba5645554a39d
Merge "Fixup comment blocks"