Merge "heic content_encoding field is optional" into pi-dev