Merge changes from topic "libsnapshot_api_update_engine"
am: e71efc3dc4

Change-Id: I862e2f1038c2481141d27b93ecab6bb11050fbf4