Merge "Address api feedback in b/323068332" into main