Product changes [2/2]

Change-Id: I41b518df62b0c057aca653f3755a47e935305ac9