Add Descrambler handling

Test: make;
Change-Id: I9df9080c97a2e3bf706587a81400afdf954538fe
4 files changed