Follow-up I99acd6c6: More files' header comment fixes

Change-Id: Icba21c6c06bc607977aa6115d2b8c333f4e83f15