Remove obsolete option

Change-Id: I31a08dfb19c3470887e158b7c21db6dd147c8672
Merge branch into kk_mkt