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

Change-Id: I06c6d888848c4a138729c560af21f9f984f793bb