Merge "Resolve change in getService return type" into main

Parents: 2aeec5b , e000aac

Committed by Gerrit Code Review <noreply-gerritcodereview@google.com> on 12/4/2024, 5:38:40 PM