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

Change-Id: Ia9a0726e4572ad76b8d8d5e23407a57cfdbcccbd