Merge "Fix another access of string array that may potentially be null." am: b4050f4ff1
am: e885675d25

Change-Id: I8b0c2108722d0364f94eb5f8a2beb4af573579d4