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

Change-Id: I8e744a739a5772e68fb87cf64747d9e7c03bf416