Backport #966

[bowenlan-amzn]

Issue #, if available:

Description of changes:
Backport #966

CheckList:

• Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

[codecov]

Codecov Report

Merging #977 (8e40ac7) into 2.x (67f583b) will decrease coverage by 0.95%.
Report is 2 commits behind head on 2.x.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##                2.x     #977      +/-   ##
============================================
- Coverage     75.85%   74.90%   -0.95%     
+ Complexity     2899     2837      -62     
============================================
  Files           366      366              
  Lines         16646    16646              
  Branches       2413     2413              
============================================
- Hits          12626    12469     -157     
- Misses         2635     2830     +195     
+ Partials       1385     1347      -38     

Files	Coverage Δ
...rch/indexmanagement/snapshotmanagement/SMRunner.kt	65.21% <100.00%> (ø)
...gement/snapshotmanagement/engine/SMStateMachine.kt	75.00% <100.00%> (ø)

... and 27 files with indirect coverage changes