Merge "Phone reboots after connect-disconnect-reconnect to GoPro" into mm-wireless-dev
am: 77eb57976e

* commit '77eb57976e67c36b33d1e3ad17ec9f4033b09398':
  Phone reboots after connect-disconnect-reconnect to GoPro