Changes for interface attach and detach

Change-Id: Ic0a536e6312af6f52946e7403e2343d9fa4970f3