AV: Aligned with CM

Change-Id: I343bead475bffecc39bd87553a13754d7aae5dfa