Fix typo.
Merge branch 'fix-typo' into adopt
Merge branch 'adopt' into trial