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

Change-Id: I0c34298e89be72caf597c964ceeb7f3396abe20b