Merge "Add the product id for recovery (D001)."
am: b240e319df

Change-Id: I9c125ba3705bd597579f1488dedd874cfb495abf