Fixing file header (cherry picked from commit 8b0a317)