Merge "Remove moved product_launched_with_* files" am: acfd17ef1a
am: 7aea7155a6

Change-Id: I5ddb231cd8ca9a0c91079036dcc096d37fd73e2b