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

Change-Id: I03aa94f04e4b5fdd2d77edff6e5a8e437e8c7347