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

Change-Id: I359aad5d7dceb2b188544db18424598decf14c08