Use the prefix in product_id for system_id. am: b56fe9f107 am: 207608d42c am: 91379fb445
am: e50304b130

Change-Id: If9c28b28d39dea6eb327f9fc93ebe0609624cb77