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

Change-Id: I80394aadb1b95d0b164a78424c18dba7beb11e5f