Sync models with migrations

Models should be the same as the state in DB after migration
blueprint db-sync-models-with-migrations

Change-Id: Iea57866206776c14677dfa78e868143b6fb153a9
Fix up trivial License mismatches

This makes the Hacking licensing check succeed.

Change-Id: Iba1446fa06fe466a05514d5df0e53d26dd9fc8e4
Merge "Fix up trivial License mismatches"
Merge "Sync models with migrations"