Merge "Mark old APIs as @removed" am: 999be29822
am: bcc49768e2

Change-Id: I2bd2f6fd6c224ee171973e706e1a877fbc2fc33d