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

Change-Id: I646b8a9f912dae28e96550dc012902ff9fc9b774