Merge "Update string for FallbackHome" into nyc-mr1-dev