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

Change-Id: Ie717da6b0e336701bdacc2949877bc0c1d71cb58