Merge "adb: log more detail on failure to read keys."