Remove unwanted capability code per API council feedback. am: 4c6f4a65b6
am: 142f57e261

Change-Id: I315788a9b7ada0858b74dcd599c897bcf04f6c80