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

Change-Id: I80632b75f5f216a8b63b510e27628556aae126f9