Added missing license header
Adhere to google style guide
Also adhere our changes to osc to the google styleguide