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

Change-Id: I2c42df343a16af721faa6e89d298af0cb9cfedd1