fix camera --test
Merge branch 'kk_mkt_r' into kk_mkt