Patch Set 5: I would prefer that you didn't submit this

(5 inline comments)

Please also update the corresponding copyright headers of any files you have touched. I noticed Activator was updated but it seems not all of them were.