Modify dynamic config xml and storage structures

bug:23625592
Change-Id: I5f950d823772df55fcfddcd2352838d60d832d6c
9 files changed