aospal/av

Change-Id: Ic1b2e85af1e37d00085cf180f237f4c784f37139