Merge "Remove Profile Annotations Experiment" into froyo