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

Change-Id: Ic3c302daaaebf563029f5b65ee8cbb7dd232c806