Updated from global requirements

Change-Id: Iebef337a6a6c56047f94abefc822ae9d90a1bdb1
Replaced "...\'%s\'..." with "...'%s'..."

We can use "'" without "\" if we use it inside of double quote pair.

Change-Id: Ia8be708611fb0f7053960773a7e32ad8f3121fd3
Merge "Updated from global requirements"