Also clean up the error codes returned by the framework, so that the settings app can properly detect an error. Original author: npelly Merged from: //branches/cupcake/... Automated import of CL 143788