Merge "Adjusting CTS test after API change to DPM#getOrganizationName()" into nyc-dev