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

Change-Id: I33f5d8954379622f7bc6e8af5a95deb0962208f7