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