STE

Conflicts:
	core/res/res/values/symbols.xml

Change-Id: Ic930a58c738c56bc27187d5828b9bab36e86a67a