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

Change-Id: I761cd5e55a7e1c5d0caf742b9ccff7c2198886cd