Merge "jpegrecoverymap: sampleMap optimizations"