This change also removes non-ASCII comment from strings.xml to suppress resource compiler warning. Change-Id: I96d3e8e2c7072816f32a15564745f8cdc3f91ee9