track own settings

Change-Id: I1a767cd8889e80c522b9e01c4bc740ede666aa44