Merge "Make AddCapabilities call GetPotentialCapabilities."
am: 12664625cc

Change-Id: Ifffc650a71679961b5d05e2ef5504957c97447b3