Merge "Remove moved product_launched_with_* files"
am: acfd17ef1a

Change-Id: I05a46bc4aeea629a6bf1b039af1e7df9811f9c71