Merge "Revert "Implement family fallback." DO NOT MERGE" into oc-mr1-dev
am: 1c34ba15b5

Change-Id: I6082a49060d322c068b9af4e5b6e169cff6a86bb