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

Change-Id: Iad313a998a159049cfc55fff978b47be93f5e834