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

Change-Id: Id75f0e2ded83361abde5ca17bb1e074c6720c988