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

Change-Id: I3bdeafe4be70779393c74916bafe76ab3f7f455e