Merge "Extend logging around instrumentation check"
am: 7d2894d67a

Change-Id: I63b7627ab0331f274d2e3a08193826cc48648b4b