Merge commit '98f90370b548e09494b1ee5c05d03e19d6e476af' into HEAD

ImageMagick version 7.0.2-5

Bug: 28936996