Merge "Preserving /avb/* keys to /metadata"