Always set expiration time

Change-Id: I2c884d61530a1faa0a958465ed80c9db0e52b9e1