DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am: e13f6fa9b6 am: 8e6c809370  -s ours am: 46a4c650bb am: 1aaf16b00e  -s ours am: 47784d61cf
am: ae7d56abe4

* commit 'ae7d56abe493e7896a24024d1cf0d16e55609e6e':
  DO NOT MERGE. Use resolved path for both checking and opening.