Merge "read and store pb file from assets to CID table"
am: a4846926e6

Change-Id: I7df22f69921cbf6861f4895a3f2a154eed1b460b