Organize citadel's setting

Bug: 169548154
Change-Id: I44c4a232e3842082a8a98c1a1c65bfc9dbd4791e
1 file changed