Merge "Update audio_route to properly handle long values" into nyc-dev