Merge "Select correct system audio route in updateAudioRoutes" into oc-mr1-dev