Add Advanced Device Specific Settings (CM)

Change-Id: I295cd4959e106b1fb105d1f08c29f21eb51844e2