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

Change-Id: Id435dde94aaaa12f3fbcba0c3159788ecce372c3