Merge pull request #1698 from hzhuang1/rm_emmc_delay

Rm emmc delay