AV: Aligned with CM

Change-Id: I343bead475bffecc39bd87553a13754d7aae5dfa
Merge pull request #1 from VlikeBanana/jb-test

AV: Aligned with CM