Loading
Fixing copyright years after accidental change during move.
Putting copyright years back to original. They were updated accidentally during the file moves. Also correcting style changes. Bug: 6993891 Change-Id: I6d6ba84a872c611d6bc8a436461b16b2336eb399