Merge "Fix api after checking in ag/10329810"