Merge "Preference API to set ID for tests to find." into nyc-dev