Merge "Fix for audio distortion on speaker am: 243503e50c am: a7bed17afa am: a75e1cd489" into nyc-mr2-dev-plus-aosp
am: aa255fb6d1

Change-Id: I45b9022998030f7231676e04a6d381bd8ac8ad45