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

Change-Id: I7561450b9530ff477eedc8782bf1d89ab2012dc6