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

Change-Id: I78b0e56ba9302e6fee2a0fe4a39cbf64ea1499fb