Merge "mmc: auto bkops fixes" into msm-4.9