Merge "Restrict AVD and VD parsing to the current element instead of the whole document" into nyc-mr1-dev