Fixed incorrect WAC decoding am: 0654cfaf17
am: f061a22e93

Change-Id: I650c729ed28ff847c224d567c0ed4ab9cdc6b192