* Make sure metadata field is present * Make sure not to copy entire messages file Change-Id: I9525f1cb35e6194de6594634c52d9f6c0587286d
Bug: T166744 Change-Id: I6466a72bc32916a7e3092b24e61961f8d422ed88