Fix optional message key

Followup to I0796b897e9646c122a46de449aaabf4d7a867f00

Change-Id: I108eb17e47fce9652ecbb58f4921d06cce7c0cce