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

Change-Id: Iee1c5190fdc5ad898b22261eb179575fa6c00d68