Merge "Add 'since <version>' to @deprecated annotations"