Merge changes from topic "libsnapshot_api_update_engine"
am: 7509fca99a

Change-Id: If91c647c9c093748caa6a812c8a4c21fdc6e424a