Merge "[CDM] Handle empty and malformatted payloads for CDM backup restoration." into main