m8: add market filter feature from 4.4.4

Change-Id: If55714aa8bffa326698042154e1bd7bf945d6227
Merge branch 'cm' into HEAD