Merge "Restrict AVD and VD parsing to the current element instead of the whole...
Merge "Restrict AVD and VD parsing to the current element instead of the whole document" into nyc-mr1-dev am: 8d4c87b0
am: e4459da2
Change-Id: Ibbbb1b912abb9a4c8950e9f6b7f5117621a02da6