Merge "Revert "Need to check empty not null for String""
am: 8c64274ee6

Change-Id: I8645fc858e4c5c3d79df1bfc72a73c447d130c59