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

Change-Id: I570f7f3556906c7e6388b7d5b98ec2cbe3558bbe