Merge "Add short string methods for capabilities and properties." into nyc-mr1-dev