Add some missing @Deprecated annotations. These should always go hand-in-hand with @deprecated Javadoc annotations. Change-Id: I0e54616d39777d43f9763a702ca0fbc381e6ed49