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

Change-Id: If4e49abbcc66cb83a3d39b4a77966f0b9190e9a8