Merge changes from topic "equalizer"
am: eba0da9019

Change-Id: I82025275ee812b1e06038f277bdb6a5fa28634ec