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

Change-Id: Idfaf4cb745cd4b59bd1494c2ffce91e88dfe937f