Settings: Add Leaf entries

Change-Id: I776d7c55802466c6a3d4cbdb2955d233d1d73246
7 files changed