Merge pull request #9268 from leoetlino/devicememcard-minor-cleanup EXI_DeviceMemoryCard: Medium cleanup
