Merge "Fix 6667238: allow market apps to support ACTION_ASSIST" into jb-dev