add self system/extras

Change-Id: I775bfea6509021950f321c10e121a9e2ce09fa80