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

Change-Id: Ic127508a569bd077f3dc670bc6998a9efb6b4064