Merge "Fix for NullPointerException in SuggestedLocaleAdapter" into nyc-dev