Merge "Api review feedback."