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

Change-Id: I64f04b9e26f529eb509cc0c97d8e7a15122109ca