Add NCM and unit column in product search.

Change-Id: Ib545c2ebe73ffee464c3cea5d3fe066b95c73f91
(cherry picked from commit dacc863a970ac8defcc89e2c5bc8e5846184c4fe)