Use resolved path for both checking and opening. am: 5accb13517 am: 3784acf34c am: 721a135472  -s ours am: fcbe3a53fa am: da4797f794 am: 9ee6a555cf
am: ecd0dab75b

* commit 'ecd0dab75b2ec0cc7ee1387b5e3b404ce6c4b898':
  Use resolved path for both checking and opening.