fixed checkstyle for market
Merge origin/M9 into M9