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

Change-Id: Ie1ca554876943333cdef1bd12d9e947fb98c2fad