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

Change-Id: Ie9e2e50dfbe50044b3b8ba9248fd52db2797443b