Merge "Need to check empty not null for String" am: e09f7b5ebb am: 99053e471d
am: 97ddb61829

Change-Id: I2b3ba7b8f1d4198120b48693e9c4fc7e7e35d0ab