Re-applied copyright header update, package rename, and java coding
style compliance.
Merge remote-tracking branch 'origin/master'