Merge "Revert "Implement family fallback." DO NOT MERGE" into oc-mr1-dev