The fix resulted in a cleaner API. (cherry picked from commit e172ca5e833ab01f3c25322b7239971475c0333d) IJ-CR-147189 GitOrigin-RevId: 692cd2ed978c6d94c73b9578864389a618066cb8