Merge "mmc: Undo mmc changes that diverge us from upstream"