Fix for V4A

This commit relies on "V4A on G2 Fix & Audio fixes" commit and is a
fix due to improper file upload.

Change-Id: I3d94b203d655bad72af12d9ca2af97f801fcc830