Merge "[AAI] Move schema service to use v23"