am d92e74bc: am 0dd1dd2f: am a57fb596: Merge "Remove no-op "capabilities"."

* commit 'd92e74bc5ef57234dfa9d726f3f0d05a9e3c146e':
  Remove no-op "capabilities".