Fix resume, and update versions

Change-Id: I64307d16d6e9f171fd93dc0abccd5cd634c88fcc