Fix message keys for some actions.

Change-Id: I245643bd56ad47a467bcfe1c48b8f099c48ebe22