Merge "Adding a constant for /metadata/gsi/dsu/avb/."