Merge "Change the pulled atom SDCardInfo to ExternalStorageInfo so that we log information about all types of external storage (e.g. USBs)."