merge in to kk_ mkt
use mass_storage
Revert "merge in to kk_ mkt"

This reverts commit 8fca790c807f9ea53d3ed90b911bcacad1568d29.