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

Change-Id: Ic2fe385089997f89675be8f8a1559db979387dbb