Merge "Fix isUsbMassStorageConnected() will always return true" into gingerbread