Merge changes from topic "revert-1509150-CSIHAIYBIX"

* changes:
  Revert^2 "suspend: Add suspend backoff unit test"
  Revert^2 "suspend: Implement new suspend backoff algorithm"