Allowing blank strings

Change-Id: I5b116cfdd4aa02529a5e7aa041ecc0ea4cff76e6