2047bf4b8b
Adding changes for v1 xml which was missed in change 604738fd8d
Change-Id: I338f2736ee61e316522f1ce42cee74abec201499