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

Change-Id: I162a366af66396f022eb3df2462fd4311b7e9099