[automerger skipped] Fixed incorrect WAC decoding am: 0654cfaf17 am: f061a22e93
am: 978ee5bdb7 -s ours
am skip reason: change_id I6d092184ab7b9897770592a5eda3619806e9f57b with SHA1 62991d883c is in history

Change-Id: If81a2ffe97840d0041ba928155113c14d7c2eda3