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

Change-Id: I19c7e3a310a9488060e9d399f2b823c74639a689