am a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev

* commit 'a2de7fc9fc0b96ba4db65ccf6c9684c8c27c2993':
  Prevent accidental unlocking of USB data transfer.