Merge changes I2b0fcb8d,I72510d61 into main

* changes:
  init_kill_services_test: += system_suspend
  init_kill_services_test: formatting for merges