am 4873beb5: am a943634a: Merge "improvement for emma filter option" into gingerbread

Merge commit '4873beb5b018d74a3b38403f34628ed6c3435888'

* commit '4873beb5b018d74a3b38403f34628ed6c3435888':
  improvement for emma filter option