Merge "Add wrapped key support for metadata encryption" am: 5ed0698b41 am: ca03b68e12

Change-Id: I494fb74aae05a0a61afddbe162d2fceeedff3ac0