Merge "remove the code that clears the passwords when the sim is replaced with a different one." into gingerbread