Merge "system manifest: fix format"
am: 969512915f

Change-Id: I7a17cbc79c216086767b61087a96489bcbf157d6