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

Change-Id: I499360f6cb7ecdf5c8580faf066c9ac0c0aea59a