Fold paths into property lists

Change-Id: Ic69f12aa3be7cea1047fd481b913df6ab25974f3
Astyle

Change-Id: Iefe93634d0573d57a95c1c0b96848db2f4ec2b8c