Restrict AVD and VD parsing to the current element instead of the whole document am: 1f859716a8
am: 897f5ca748

Change-Id: Ifc946e58e0455dac385f34a92e4181144a36edd8