Fix for interfaces set

Change-Id: Ie8073be358b8f5d03f0b236cf824486380ac30eb
Closes-Bug: #1308450
Merge "Fix for interfaces set"