Merge "Change storage metadata type to byte array"
am: dcab2c1b4c

Change-Id: I66e07b5a1d011a7682c28a4edad4550dd07964e9