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

Change-Id: I35662301d060a645a0672e9ad89d2228c4f0a87b