Merge changes from topic "equalizer_1" am: 1ba697e29b
am: 46f2249f46

Change-Id: Icd3c715dfed772d05b8314a394aad2725a9937e0