Track our own base and settings

Change-Id: Ic53e2822c42dc28bcce22662e20fe371a5641943