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

Change-Id: Id56528c56ec4520591c00b53faf6b4de7380b891