ST-Ericsson specific changes