(cherry picked from commit 30441cd6)

Conflicts:
	sc/inc/sc.hrc

Change-Id: Ia306ca5b791504590657fcb8b6e404a75f8a4c79