Merge "Remove an API that doesn't exist." am: 454b1e37eb
am: a9725d2d6d

Change-Id: Ie7fea7d068053b4e502e2ac8448d392db9c9d54f