Retention should always be an int

Change-Id: I76f62816adb6062d66ba3ef443c12bca1de4d6ad