Merge "USB: Add nop functions for !USB case" into msm-3.0