Use Strings.isNullOrEmpty instead of just null check Change-Id: Id46cfee896415b8437febd8e8a8abe6dd864c11c