Merge "libsnapshot::RemoveAllUpdateState log stack" am: e8cd50a7a0 am: 579f86807a

Change-Id: I912c7cea020c20611ba9cf03adfdd48529934c01