There were some mistakes in previous merges from pi-dev to master in whitespace and copyright notices. This fixes them. Test: tested as part of http://go/ag/4674759 Change-Id: Iae46c121de59233b62925a4d8c97f2b370e3e7f1