Merge "Sync description with exceptions" into froyo