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

Change-Id: I95dbaf4e2df000898b841a8b74797012358a2679