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

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