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

Change-Id: I2a316bdf29a3c77ef4112ed16feeca7af40db615