Advanced Settings

Change-Id: I6989a4c6a8e7e6ef96a9c5b43d78b2f927129a55