Merge "Adding a constant for /metadata/gsi/dsu/avb/." am: 0a5a944d42

Change-Id: I83ee6bf5f65b7fa0b8943fa60edf3e1fbd707f43