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

Change-Id: I80a4f277112b13b0c39b701ff04b496420512ae2