Merge changes from topic "equalizer" am: aad139a2d3  -s ours
am: 2c292120aa  -s ours

Change-Id: I7d40f3964fd312fe645dba2b05cc324fea079321