Merge "Add missing @Deprecated annotation." am: 498562c3cb am: cccb4f08ea
am: ebb1d94ccf

Change-Id: Ic0d827f16475f0902941241dd6e20039a3c545f3