Merge "Merge "Add UsbHandlerTest test for NCM and RNDIS at the same time." am: d6d96a46 am: b6925c2f am: 39645c25" into sc-dev