am f2ea0171: am c077ee31: Merge "Added copyright notice and formatted to convention"

* commit 'f2ea01717b918471b050bea46529e1843d36fc84':
  Added copyright notice and formatted to convention