Add Advanced settings
credits: gokussj

Change-Id: I427b829b4411923469b7075f28a1b2f84b04eb99