Merge "adding a public constructor for DeviceProductInfo. Improving javadoc for #getManufacturePnpId" into sc-dev