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

Change-Id: Ia581ac4c22d963ac36a25493b4c7bd6c0edc2a6a