Fix enc/dec mismatches for aq-mode 1 and 2

Change-Id: Iefad9d8d96a08dcc788a5efdca2df6a815d1205f
2 files changed