Preparing for merging into iphone-common repo