Merge "Revert "libsuspend: move to exponential backoff"" into nyc-mr1-dev