Merge changes from topics "metadata_wrapped_key_aosp", "volume_metadata" am: 36fd1ebf am: 6891eb7e Change-Id: I39904b704f983124afd8ff62cd3b863fd600e6a2