Review changes for enable sdcard pull request