Merge branch 'fix-dep' into 0.9.7+x

https://codereview.chromium.org/1946803002/