Add more unique constraints.

Change-Id: I393307ef028f884b9f044706556df3057a0f7365