Merge "Mark Deprecated Classes and Methods"