Merge changes from topic "libsnapshot_api_update_engine" am: 7509fca99a
am: 98af6698b1

Change-Id: If4dc91cd1146b2ec8b1b569b3cec5e7e97f70fff