Addressed code review comments

Addressed code review comments
Encryption support and full E2E

Encryption support and full E2E
test fixes

test fixes
queue change

queue change
use main queue

use main queue
Addressed CR comments

Addressed CR comments
fixed conflicts

fixed conflicts