Convert two hardcoded strings to messages

Change-Id: I76a8bd16b09802e4b509761c1ff838feee1ebe92
Merge "Convert two hardcoded strings to messages"