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

Change-Id: I069bbdabe82b030706281bf10cfa8a59ec18a722