Merge changes from topic "equalizer" am: aad139a2d3  -s ours am: 2c292120aa  -s ours
am: 228e5b94e3

Change-Id: I480f3645c89dbd44117f18a5807f8aea753439ab