Merge "Recently, Account gained a field: senderName. When serializing/deserializing that field using JSON a bug was introduced where null is serialized in and "" is deserialized out. This checkin fixes the problem." into ub-mail-master