Merge "Need to check empty not null for String"
am: e09f7b5ebb

Change-Id: I8391859b8ba23455b24dcc21046b4a0d186a1ee3