Merge "Add deduplication logic to BitTableBuilder." am: c2bd7a7135
am: 32a502f7cd

Change-Id: I9c739b6132b9b5c35b8112910684ae104ce1d2db