Merge "Make addUnwantedCapability method public" into pi-dev