Merge "Deprecated class and annotation change"