Add support for vendor product and device name

Change-Id: Ic5913e587400dd38c04aa05de3a7becced77a59e