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

Change-Id: If9bf78cfedcac5ed4c5ca64b964e5a6d728fcd63