Merge "Fix aosp generic fallback configuration sample rate" into oc-mr1-dev