Merge "mmc: block: reduce the block timeout to 30 secs" into msm-4.9