null strings will be persisted as ""

Change-Id: I90345a98a0735142df5b5910516ed1c155ce1e14