Merge "Add some missing @Deprecated annotations." am: 9424680a52 am: c8fd88131e am: ba4ed71528
am: 331caed355

Change-Id: I09b2f13aa13cedc6cb7e28ec4283e3f0aa466cb9