More Android changes.