Merge "adb: log more detail on failure to read keys." am: 69627e52b9 am: b186f5fe1f
am: e90be182c9

Change-Id: I73db342c69163c195a3ca3348e608821da5c429c