Make string comparison robust against null values.

  Bug: 17999505

Change-Id: Ic255603a5664e7d9be80d9e18435924e18d4ba66
1 file changed