Fixed some message keys

Some keys replacements were not saved

Change-Id: Ib97911e3c10bca9947aa669c71632e0a64bc0eee
Merge "Fixed some message keys"