Merge "Preserving /avb/* keys to /metadata" am: 05aff5b211

Change-Id: Ibf1c8b6cf4d692ca6b87532d8b5bb83f9c6d7f18