Merge "system manifest: fix format"