Merge \"Add short string methods for capabilities and properties.\" into nyc-mr1-dev
am: 255ad67b2e
Change-Id: I08eee2568eef8904a1a4a66753ecca07ce2eff65
This commit is contained in:
am: 255ad67b2e
Change-Id: I08eee2568eef8904a1a4a66753ecca07ce2eff65