Update for build 18019.
Merge pull request #8 from Rawaho/master

Update for build 18019.