Merge "CDD: USB mass storage class req for AOAP" into mnc-dev