Merge "Fix the last remaining @deprecated tag without comment warning." into gingerbread