Assisted snapshot improvements

blueprint assisted-snapshot-improvements

Change-Id: Iedae1fd71c11a3d81fb88b48ed3ef19160049744
Merge "Assisted snapshot improvements"