Patch by: Tsutomu Uchino
Review by: arielch
Conflicts:
	sc/inc/scerrors.hxx

Change-Id: Idebf093b599b57cd0be4c871590db75c59c14dc1