Merge branch 'fix-dep' into 0.9.7+x

https://codereview.chromium.org/1946803002/
tree: d765d8c48def7ffdddc09663c9cb1ff8cd64891f
  1. pkgs/