Fixups for lambda b75.
Merge branch 'master' into internal
Fixups for lambda b75.