Save banner messages even if the name contains a hyphen

Change-Id: I5be095f40ae85c79c246de28aafe590bb7221463
Merge "Save banner messages even if the name contains a hyphen"