Update format to be compatible with 11329 patchset

Change-Id: I37377ab6a6d3682cef36c0dfd65158aa64a0600f
5 files changed