Merge "Fix another access of string array that may potentially be null." am: b4050f4ff1 am: e885675d25 am: 2b418f0508  -s ours
am: 0bdbe46c56

Change-Id: I95b144a0dcd5d743b1d12c4584ba22cf47fe8724