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

* commit '0dd1dd2f318c1ae7a9f1844625e7ff85a1119a88':
  Remove no-op "capabilities".