Replace space with underscore in an optional message key

Change-Id: I3213f36efc7c6268c18ba4bcd0124bc38900bc15
Merge "Replace space with underscore in an optional message key"