Merge changes from topic "am-d38889e594aa4419941cf597829c5e80" into main

* changes:
  [automerger skipped] Merge "Enable rollback lifetime API changes during install" into main am: 1034330c5a -s ours am: 86cd412df9 -s ours
  [automerger skipped] Enable rollback lifetime API changes during install am: 42ef4d2aa8 -s ours am: 6dad41b8ba -s ours