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

Change-Id: Ia0205d7fef8599e3f29d1c0c6a2aaf2247f109c2