Merge "Fixed incorrect WAC decoding" into qt-qpr1-dev am: fa35152703
am: 917396bf71

Change-Id: Icc2d314e9ddf444f29970dda52d6916e7c6b3f7b