Merge "[Settings] keys with @TestApi need to have @Readable" into sc-dev