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

Change-Id: I8ef8a0dabb8840faee9d601bae49794126fa40ee