Updated for system-id configuration

Change-Id: I4fef1aa4def2a7744ce0409a07f7011239a31251