Merge "Doc change: adjustments to the api changes description" into froyo