track our own Settings

Change-Id: I635bad5fae37db7e4fe273f7ba1e16e9ccfd27fc