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

Change-Id: Iedd6add571f18bd517e84ebaff3e81bb3e8acf3c