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

Change-Id: Ice30ea86acd7abfa71c0053dc1459361b4bbfb6c