Merge "More encryption-aware triaging." into nyc-dev