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

Change-Id: I1730b80585c5d5064fda8ec4d598a95651d7c3eb