Merge action-globalunblock message into action-globalblock.

Follow-up from d9a99c6.

Change-Id: I42607561b66b8ccfe507d0ea498b50a0e67ddf3f