Merge "libsnapshot: Call EnsureImageManager before RemoveAllImages" am: fea51309dc am: 1ea06b9d8c

Change-Id: I4704b427491e6e3041c7bde684ebb9f1e7e89012