Add primary key to tables
As requested in T278719#6959842
Bug: T278719 Change-Id: I2349d968abb4e774a09afa339c95a0b334280cf7