[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours
am: 81f274ebb2  -s ours

Change-Id: If52edfd7ab1fa83debd3b1725b8e449f38017ad6