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

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