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

Change-Id: I0b452ee965b1031cc83f1d629e72cab135d70946