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

Change-Id: I7b0f66c92bd795f3995191740be5fd08b20dbf62