Merge "Surface: Add force disconnection method." into nyc-mr1-dev am: 6cc1933af9
am: a92604b3cd

Change-Id: I791e00bc2584581066f6cda89ea0bda063ba0645