Merge "sdcard: avoid benign unsigned overflow"