Merge "Revert "[adb] fix signature check""