Merge "Move packet definitions to their own file." am: ed1aa266ce
am: 564a9cbd13

* commit '564a9cbd1304a9311fff33c11f6686d20c9c2402':
  Move packet definitions to their own file.