Merge "Pass operationId to LSS, add HAT to KeyStore" into rvc-dev