We want to leave 31 in the checked in version because retainEntry() API needs version 31.