Merge "Remove reference to PRODUCT-*" am: 2d531bf7e1 am: 7830315feb am: 74fa99e115
am: a9c13468d3

Change-Id: Ibe394e283f13b5ff36954a6051652910f2341a48