Merge changes from topics "dm-default-key-v2", "metadata_cipher" am: cb1a8e7fdd am: f6bb9cd7ad

Change-Id: I391b43ec23408954ba935b563757d525ae06b46e