only show expiry time if exists

Change-Id: I24ad5743a62bfe6d53831dd5de742898b858b013
Only set expiration days if they exist

Change-Id: I068aa9dfe020cb3ebe294cfac13dabe22d461f98