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

Change-Id: I024c4bff8b733fdf2216cdd16164a2d880aaf91b