Merge "Update language to comply with Android's inclusive language guidance"

            }

            listPush(effectLoadResult.effectDesc.get(), subEffectList);

            // Since we return a dummy descriptor for the proxy during

            // Since we return a stub descriptor for the proxy during

            // get_descriptor call, we replace it with the corresponding

            // sw effect descriptor, but keep the Proxy UUID

            *effectLoadResult.effectDesc = *swEffectLoadResult.effectDesc;