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

Change-Id: I437a8df1ab65d5d2f480664c0ca537de9f6ad497