Don't show exipration text if no expiration

Change-Id: I7fc6b4917b541f7fe1709520e878831d852af7bc