Reorganize values for comac-in-a-box

Change-Id: Ia0b8450ea92c27524ec25c8f2641fbb299d4eaa8
2 files changed