Changes to fix Galaxy S3