Restrict AVDC and VDC parsing to the current element instead of the whole document am: 67b6c5f8b8 am: ee230dd68c
am: eaf8005723

Change-Id: I1f15a44cb7376ec91ffbfd2de20cb32a2373781a