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

Change-Id: I3e27ed3481542e5e6fe0db2c872d745151e50765