Merge "Update format to be compatible with 11329 patchset"