Fix for interfaces set

Change-Id: Ic9c56a77625b74c3fa01936c73029b4cea6915b1
Merge "Fix for interfaces set" into stable/4.1