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

Change-Id: Ic25f3d1a5b536b5e8572822c5e7a2c9cfa730ecf