Add back noise suppression.

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