am 12a4d031: am 51ba8b47: am 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev

* commit '12a4d0313f8e964b727484448bd9b4ed8af1dc5f':
  Fix Usb-C dialog issues