Merge "Revert API constants to previous value to match hardcoded value in google3 apps" into lmp-dev