RC: Suspend actions (2/2) - Squashed

Change-Id: Ib29271bad0698b8d1ac70ac5a4d28d7da7b4c720