am d1d86037: am 8f1c528d: Merge "Add UNIQUE to EntrySchema." into jb-dev

* commit 'd1d86037aa7170fc8c76da4879eecd405931bc07':
  Add UNIQUE to EntrySchema.