Stats.resetCounter NPE fix
Merge remote-tracking branch 'fb/master'
Use COPYRIGHT_SECTION