am 2fbfe429: am 92c1d283: am 706ad39b: am a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev

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