Fix issue with electronic_delivery_keys = nil.

Change-Id: I30e1199db7ce0e04bc23d2aa062dedd653c06afc