Initial changes for jellybean-release