am cbf90380: merge from open-source master

Merge commit 'cbf903803850deb4f70490d97a1603e7b8679cc2'

* commit 'cbf903803850deb4f70490d97a1603e7b8679cc2':
  Not all failures to fopen_root_path() are serious.