use cm logic to find products

Change-Id: Ib0abdc81a66d125f30ed919855f8779a6ff75018