Merge "Add support for casefold and product ID to format" am: 2e10d8f74f am: c50d82e418

Change-Id: Ifc48930d146f940a5339da579f05978992e3431a