This will allow to configure addressing based on inventory Change-Id: I71517146a197e39ed8ff2205e4234685d95331ad