Sometimes the struct member is called like df-telecom, but in other cases it's called df-df-saip with a double 'df' in front. That makes no sense, but we have to deal with it from our constructors... Change-Id: If5e670441f03a47fa34e97a326909b24927c12f7