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

Change-Id: Iaa12ce16ec98792226e7b83c5bcbcff3b62edc18