Merge changes from topic "equalizer" am: eba0da9019 am: d891c81cad
am: 3a6c0dc7b7

Change-Id: I1d829ed7dbd440ac61ea1f4a0bd2201176960d52