Merge "InterfaceConfiguration: Don't use @hide Sets class" am: 2bf6bf92c6 am: e7182d5ba5
am: 3f3dd3b432

Change-Id: I2538620dc77f8bbde5d3589aef22a1675e25fb03