Merge "Extend logging around instrumentation check"