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

Change-Id: I05221a9ee2295c18954499e17b9154fc9d3ddad6