Merge "Defeat @Nullable String[] with empty list." into oc-dev