Merge "libsnapshot: Only EnsureImageManager when it is needed." am: 81a0738c68
am: 3d613876e9

Change-Id: If93509ecbdad0635d6df41b2b8e13d5d879e1165